Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 27 Apr 2010 12:24:59 +0000 (12:24 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 27 Apr 2010 12:24:59 +0000 (12:24 +0000)
commitc469e502dadadf4b303b0d7d14c6c839261d40ed
tree28aead4ef9bb651f0ec6816da2577a97bed9faf7
parente0a649501bafa947496d973173e73bdbcdf02308
parent20f7bfcdceb1d8a4ee79ebc94a75d40dd161a2a4
Merge from mainline.